From: Greg Kroah-Hartman Date: Mon, 16 Jul 2012 20:16:09 +0000 (-0700) Subject: Merge 3.5-rc7 into usb-next X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~10674^2~53 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b903bd69e3fa156598def8d6433dfe5352af8da3;p=linux-4.9.git Merge 3.5-rc7 into usb-next This resolves the merge issue with the drivers/usb/host/ehci-omap.c file. Signed-off-by: Greg Kroah-Hartman --- b903bd69e3fa156598def8d6433dfe5352af8da3